Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20822] Refactor Fast DDS Ubuntu CI to include several tests (backport #4860) #4957

Merged
merged 3 commits into from
Jun 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2024

Description

This PR introduces a "small" refactor in the Fast DDS Ubuntu CI.
It splits current CI into build and tests, and introduces new jobs that uses the already built library to build other products and run their test suite.
That would allow Fast DDS developers to detect possible issues that can affect other products while introducing changes in the Fast DDS library.

graph BT;
    fastdds_build_test --> fastdds_build
    fastdds_python_build --> fastdds_build
    fastdds_shapes_demo_build --> fastdds_build
    discovery_server_build_test --> fastdds_build
    fastdds_python_build_test --> fastdds_python_build
    fastdds_docs_build_test --> fastdds_python_build
Loading

@Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • N/A The code follows the style guidelines of this project.

  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A Any new/modified methods have been properly documented using Doxygen.

  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • N/A Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • N/A Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4860 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Jun 17, 2024
Copy link
Contributor Author

mergify bot commented Jun 17, 2024

Cherry-pick of 22338f3 has failed:

On branch mergify/bp/2.6.x/pr-4860
Your branch is up to date with 'origin/2.6.x'.

You are currently cherry-picking commit 22338f3fc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	renamed:    .github/workflows/config/asan_colcon.meta -> .github/workflows/config/asan.meta
	deleted:    .github/workflows/config/ci.meta
	new file:   .github/workflows/config/discovery_server.meta
	new file:   .github/workflows/config/fastdds_test.meta
	renamed:    .github/workflows/config/ci.repos -> .github/workflows/config/fastdds_test.repos
	new file:   .github/workflows/config/python_test.meta
	renamed:    .github/workflows/config/tsan_colcon.meta -> .github/workflows/config/tsan.meta
	modified:   .github/workflows/sanitizers-ci.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/config/documentation.meta
	both modified:   .github/workflows/config/fastdds_build.meta
	deleted by them: .github/workflows/documentation-tests.yaml
	deleted by us:   .github/workflows/nightly-ubuntu-ci.yml
	both modified:   .github/workflows/reusable-mac-ci.yml
	both modified:   .github/workflows/reusable-sanitizers-ci.yml
	both modified:   .github/workflows/reusable-ubuntu-ci.yml
	both modified:   .github/workflows/reusable-windows-ci.yml
	both modified:   .github/workflows/ubuntu-ci.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@JesusPoderoso JesusPoderoso added this to the v2.6.9 milestone Jun 17, 2024
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4860 branch from cd766c7 to 2e359f4 Compare June 17, 2024 12:51
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Jun 17, 2024
@JesusPoderoso JesusPoderoso requested a review from Mario-DL June 17, 2024 12:52
@github-actions github-actions bot added the ci-pending PR which CI is running label Jun 17, 2024
* Refs #20822: Split current job into different jobs

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add shapes demo build job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add discovery server build test job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add python build test job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add documentation build test job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Remove previous documentation workflow

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Avoid building with tests if not running tests

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Try to fix documentation job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Move conditions to reusable workflows

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Apply internal review suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Refactor meta files into build and test, and combine them in test steps

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Remove matrix from ubuntu CI

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Revert "Refs #20822: Move conditions to reusable workflows"

This reverts commit d4eea0d.

* Refs #20822: Apply rev suggestions

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add missing discovery server requirements in the job

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Apply rev suggestions (2)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Fixing windows workflow by merging metas

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Add step with alternative builds

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Use colcon test meta in all jobs, and fix xfail filter

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Remove redundant CMake args, and fix alternative builds

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Apply rev suggestions (3)

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Explicitly compare boolean inputs

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20822: Install tools on test steps to avoid losing symlink permissions

Signed-off-by: eduponz <eduardoponz@eprosima.com>

* Refs #20822: Update discovery_server meta file name

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Adjust ternary operators

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

* Refs #20822: Use CCache based on an input parameter

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>

---------

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
Signed-off-by: eduponz <eduardoponz@eprosima.com>
Co-authored-by: eduponz <eduardoponz@eprosima.com>
(cherry picked from commit 22338f3)
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4860 branch from 2e359f4 to fc3c06a Compare June 18, 2024 07:06
@JesusPoderoso JesusPoderoso requested review from Mario-DL and removed request for Mario-DL June 18, 2024 07:07
.github/workflows/ubuntu-ci.yml Outdated Show resolved Hide resolved
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso requested a review from Mario-DL June 18, 2024 07:18
Mario-DL
Mario-DL previously approved these changes Jun 18, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

Mario-DL
Mario-DL previously approved these changes Jun 18, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso force-pushed the mergify/bp/2.6.x/pr-4860 branch from 08ed3dd to a79c555 Compare June 19, 2024 13:28
@JesusPoderoso JesusPoderoso requested review from JesusPoderoso and removed request for JesusPoderoso June 19, 2024 13:29
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Jun 19, 2024
@EduPonz EduPonz merged commit eb16c4e into 2.6.x Jun 19, 2024
14 of 17 checks passed
@EduPonz EduPonz deleted the mergify/bp/2.6.x/pr-4860 branch June 19, 2024 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants